[XEN] Explicitly include domain_page.h for map_domain_page() and fix a

warning about arithmetic on 'void *' pointers.
Based on a patch from Jimi Xenidis <jimix@watson.ibm.com>
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 9a0f3434a7110220d8008398397b2d0e2671b5a4..32c20b0547c48edc9fd9fdf9d4358e67b45f164e 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -30,6 +30,7 @@
 #include <xen/mm.h>
 #include <xen/trace.h>
 #include <xen/guest_access.h>
+#include <xen/domain_page.h>
 #include <acm/acm_hooks.h>
 
 #define PIN_FAIL(_lbl, _rc, _f, _a...)          \
@@ -818,7 +819,7 @@ __gnttab_copy(
 {
     struct domain *sd = NULL, *dd = NULL;
     unsigned long s_frame, d_frame;
-    void *sp, *dp;
+    char *sp, *dp;
     s16 rc = GNTST_okay;
     int have_d_grant = 0, have_s_grant = 0;